834ae821e7aed687c45aa4a9210940210decd8ed,opennms-dao/src/main/java/org/opennms/netmgt/dao/castor/DataCollectionConfigParser.java,DataCollectionConfigParser,merge,#SnmpCollection#,341

Before Change


     * @param the SNMP collection
     */
    private void merge(SnmpCollection collection) {
        checkCollection(collection);
        merge("collection", collection.getName(), collection.getResourceTypeCollection(), collection.getGroups().getGroupCollection(), collection.getSystems().getSystemDefCollection());
    }

After Change


     * @param collection
     */
    public void parseCollection(SnmpCollection collection) {
        if (collection.getIncludeCollectionCount() > 0) {
            parseExternalResources();
            checkCollection(collection);
            // Add systemDefs and dependencies
            for (IncludeCollection include : collection.getIncludeCollection()) {
                if (include.getDataCollectionGroup() != null) {